From 2ae996e242ca04c612efb6d8741528e06e146861 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Wed, 12 Oct 2016 19:48:16 +0200 Subject: [PATCH] widget: Remove gtk_widget_get_pointer --- docs/reference/gtk/gtk4-sections.txt | 1 - gtk/gtkwidget.c | 49 ---------------------------- gtk/gtkwidget.h | 5 --- 3 files changed, 55 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 8148ffcb6b..dc2a893192 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -5072,7 +5072,6 @@ gtk_widget_get_toplevel gtk_widget_get_ancestor gtk_widget_get_visual gtk_widget_set_visual -gtk_widget_get_pointer gtk_widget_is_ancestor gtk_widget_translate_coordinates gtk_widget_hide_on_delete diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 140cd5eb36..a6df4c5cda 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -10400,55 +10400,6 @@ gtk_widget_get_device_events (GtkWidget *widget, return GPOINTER_TO_UINT (g_hash_table_lookup (device_events, device)); } -/** - * gtk_widget_get_pointer: - * @widget: a #GtkWidget - * @x: (out) (allow-none): return location for the X coordinate, or %NULL - * @y: (out) (allow-none): return location for the Y coordinate, or %NULL - * - * Obtains the location of the mouse pointer in widget coordinates. - * Widget coordinates are a bit odd; for historical reasons, they are - * defined as @widget->window coordinates for widgets that return %TRUE for - * gtk_widget_get_has_window(); and are relative to @widget->allocation.x, - * @widget->allocation.y otherwise. - * - * Deprecated: 3.4: Use gdk_window_get_device_position() instead. - **/ -void -gtk_widget_get_pointer (GtkWidget *widget, - gint *x, - gint *y) -{ - GtkWidgetPrivate *priv; - - g_return_if_fail (GTK_IS_WIDGET (widget)); - - priv = widget->priv; - - if (x) - *x = -1; - if (y) - *y = -1; - - if (_gtk_widget_get_realized (widget)) - { - GdkSeat *seat; - - seat = gdk_display_get_default_seat (gtk_widget_get_display (widget)); - gdk_window_get_device_position (priv->window, - gdk_seat_get_pointer (seat), - x, y, NULL); - - if (!_gtk_widget_get_has_window (widget)) - { - if (x) - *x -= priv->allocation.x; - if (y) - *y -= priv->allocation.y; - } - } -} - /** * gtk_widget_is_ancestor: * @widget: a #GtkWidget diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 9a9a3c5cbc..5102b2d154 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -1062,11 +1062,6 @@ gint gtk_widget_get_events (GtkWidget *widget); GDK_AVAILABLE_IN_ALL GdkEventMask gtk_widget_get_device_events (GtkWidget *widget, GdkDevice *device); -GDK_DEPRECATED_IN_3_4_FOR(gdk_window_get_device_position) -void gtk_widget_get_pointer (GtkWidget *widget, - gint *x, - gint *y); - GDK_AVAILABLE_IN_ALL gboolean gtk_widget_is_ancestor (GtkWidget *widget, GtkWidget *ancestor); -- 2.30.2